From d879dd80cfe0d15989ab5b2c8bf81f21d7b77de6 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 Oct 2016 12:44:54 -0500 Subject: [PATCH] Don't copy missing-file.dfsg to THE-GNU-PROJECT THE-GNU-PROJECT is now compatible with the DFSG. Remove missing-file.dfsg entirely since it it no longer being used. --- debian/missing-file.dfsg | 10 ---------- debian/rules | 11 ----------- 2 files changed, 21 deletions(-) delete mode 100644 debian/missing-file.dfsg diff --git a/debian/missing-file.dfsg b/debian/missing-file.dfsg deleted file mode 100644 index 47ad34108a9..00000000000 --- a/debian/missing-file.dfsg +++ /dev/null @@ -1,10 +0,0 @@ - -The file that would normally be displayed here (@FILE@) has been moved -to the emacs@MAJOR_VERSION@-common-non-dfsg package because its -license does not appear to be compatible with the Debian Free Software -Guidelines (DFSG). Please see -/usr/share/doc/emacs@MAJOR_VERSION@-common/copyright for more -information. - -Please install @FILE@ from Debian's non-free distribution if you would -like for Emacs to display the original file. diff --git a/debian/rules b/debian/rules index 6548970ba0b..2ef88dedf51 100755 --- a/debian/rules +++ b/debian/rules @@ -466,17 +466,6 @@ override_dh_auto_install: $(autogen_install_files) dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \ usr/share/emacs/$(runtime_ver)/lisp/COPYING - # Install replacements for non-free files that can be reached - # through C-h - for f in THE-GNU-PROJECT; \ - do \ - sed \ - -e "s/@FILE@/$$f/g" \ - -e "s/@MAJOR_VERSION@/$(major_ver)/g" \ - $(CURDIR)/debian/missing-file.dfsg > \ - $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/$$f.dfsg ; \ - done - $(pf); cd $(pkgdir_common) && \ find -name "*.elc" | perl -pe 's/\.elc$$/\.el/o' | xargs rm -f -- 2.30.2